Added a RichDataset which can be eventually used in the processing work.
Bit of a move around
Moved TODO comment.