persistent state

Pls rebase no merge

Using a pull request for code review purposes
Really? I can't seem to get it to work