Abstracted out collision detection, added collisions with buildings.