Changed class variable types, made steps in the right direction