Cleanup and reorganization
Collision Detection
Future Plans...