More changes, basically finished