Starting to Re-write the Engine