persistent state

Pls squash + rebase no merge

Using a pull request for code review purposes