Data science

Refactored classes based on comments from @bwthomas