Small changes prior to making client form
Baseline adding new user functionality
Merge branches 'master' and 'attemptingForm'