Finished refactoring, debugging, #20
Dataset refactoring completed, closes #20