Final Monday Commit, added new class, TODO: create data type for DataTables