Finished adding original state, without test cases (separate story).