Fixes #25

* Passed null into ExpressionEvaluator, replaced with Petri net
* Tested manually, seems to work