added todos and started reworking on the skeleton of the engine