More work on collisions

Need to separate forces for each object.