working on tests, and killing mutable state!