Progress toward #17