Changed a few things around: TODO list added, Collision code re-aranged, etc.