More changes, need to fix tests