Fixed a few more bugs, almost working
Fixed a few more things
All working as a standard simulator
Merge pull request #1 from JakeAlbee/local

Local