Started adding plumbing for assigning class in the master