Major changes to database TODO: FK Restraints