Fix up relationships and foreign key primary key shit
Comment out unused views
Change the types of the keys for relationships