Fixed collision detection and started working on collision resolution