Updated Table Schema and other code

Last commit before creating first set of branches.