refactoring; home consent & email working