More changes and some work.