Baadier Sydow
Reduce MVP scope to get rid of the scope creep that came in #jonga