More #66 stuff... bluh. Hope this is the end of it.
Completes enhancement #36.