Finish rough draft for MVP