More changes that just compile. Not run. Untested.