Completed some work on engine