Continuation of model refactor to classes