Fix bugs
Updated initialize to use new store
Finished bugfixing based on sprinkler tests