more signup work (WIP)