Partial Upload

Just a partial commit. Working on figuring out how best to do physics
and collisions.