Added TODO and changed class name to Engine