Simulator + test
Merge pull request #15 from JoeTheDentist/feature/simulator

Feature/simulator