Bunch of changes to the onboarding process. A little buggy.