Start converting global funcs to class methods