Work on task 2.
Merge.
Removed more classes.