Class is now fully unit testsed, and ready to be merged