Removed rotation from entities and added Entity collision detection