seems to work...
sigh, I really should be doing all of this in a dev branch...