Fix TODO's added.
Removed small classes, moved more functionality to the mongo class.