Bug Fix. Rewrite Teacher/Designer code to actually work!