Still working on engine

Made a lot of changes in the way I'm handling the mechanics.