add alembic, rejiggle entire model