Broke up initialization method from level 1 into smaller methods
Merge remote-tracking branch 'origin/v1' into v1