Performed first stage of moving to collision models: Moved AABBs to new system