More collision and rendering work