added solver, and started work on collision detection again