init2
Test commit
fix merge conflicts
refactor for blueprints & db models. WIP: change pointer for DB