Initial Push

Collisions need work.