Add states and start refactor