Changed model methods to be classmethods and instance methods, where it made sense.