More state-oriented refactoring
Boyfriend interrupting me