More collision work - not done yet