Further progress.

Still a little buggy, but committing to save it off.