added box collisions and stuff