[Broken-ish] Lots of work on signals, reorg, etc