Working on solid collision detection and resolution