Big momma merge

Rolled classroom back in! everything should work as before.