Added the fixes to get the classroom running with advanced

This is not complete. I have not actually gone through the labs yet. But this gets the classroom working.

It will also require updates to the instructor guide as there is a new manual step for instructors.