major restructuring of signup