Add stateful interpreter
Merge conflicts