Toolkit 2 - Blocking + Force & Trajectory

Its not the best and there's a lot of cleaning up to do still, but I thought i'd upload what I've done.