First commit, works without a persistent state