Incompltete changes and tests
Merge branch 'sign-up'