Working on the basic engine