Margaret branch

I updated the files that I have changed and updated the migration to work after deleting existing tables.