Separate view and model.  Start testing.