heh, yeah. work-in-progress PR :-)