Created some containers defining states and updated state transitions to reflect this.