more hacking on pass. see TODO at top of file