Christmas update!

Added collision physics.
Refactored code.