cherry picked marian's sign up feature, and sorted out the steps files