new model. Reworked collision stuff in existing modules