Breaking out control from models, stubbing out some logic