Issue #2
DataLinker

Refactoring the dataset linker, and making unit tests over the linker