MVP + Some optionals for Assignment 1