Working on controls... yo
Engine refinements