Consolidated Schema Changes

Currently not compiling, yet.