- updated todos
- cleanup
- started implementation of persistent rules
- implemented persistent rules
Merge branch 'develop'