Some changes. Committing before SQLAlchemy switchover for user database.