Working version of add class and add student before the rewrite