Some code clean-up and some getters implemented.
Collision implemented half way through.