Temp commit: changed from serial program structure to classes. Not ready yet, though, hence the testfile.py