Correct rebase in a hurry
mvvm: Interaction tier architecture