Finished MVP and some extra tasks.