Stashing this stuff in preparation for switching back to the Wyers branch.