Upgrade model. Add MVP UI prototype