Updates to my classes, added comments