More changes. Almost ready to test.