More progress

Gonna put this on the backburner for now. The code is even messier
than I first thought -- I'm gonna try a from-scratch STFS library.