Make per user methods to instance methods - not static