Second commit, scaffolding complete, database migrated