mainly focused around the engine refactor