Big refactor, save a state