Completed Simulator
Fixes #33
Fixes #32