Don't remember why I stripped out configure, etc.