Feature/onboarding

pulling into master for now.