Added rough collision detection, needs finishing
Collision moved to a static class