Super refactor of collisions & bounds + engine upgrade