More innumerable changes. Almost ready to go.