Finished MVP, onto features and prettifying