Work on Engine update loop and similar