Implemented MVP

More refactoring needed