last commit from 7/09. Not much done.