Consolidated Schema Ccanges

Currently not compiling, yet.