changed Schemas for the new lab.

MAY NOT COMPILE