Incremented generic state implementation. Most tests passing.