More redesign, added class info, assignments