Changed stuff to classes, split data stuff into a new file, switched back to csv loading.
merge