Started refactoring class var into class Value