Lots more changes, ready to test.