added course & subject models, plus some make shortcuts