Added more comments to the classes, removed TODO's