Completed refactor, db init working