First pass refactor of init flow.