wow, this is really broken.  about to rip and replace, and wanted to
commit in case i break it even worse