Major restructuring to intregrate with the Bullet Engine