6-5-2013a

Fun things, fixed collision.