Fixup sqlalchemy
Finish database loading scripts