initial commit
switched to PG and fixed initial migration
merging