Begin refactor for model view model separation
Extract model from view model
Refactor view model.
Refactor command structure.
Refactor, complete add command.