Updates
Defines functional Object-Oriented main
Starts changing collision detection mechanism