Adding refactored engine
Merge pull request #2 from emtwo/newEngine

Adding refactored engine