Filled in TODO MVP & Models