Start tidying up sign up flow. Need to write tests for validation etc.