More changes. Testing isn't going too well, but hopefully will be resolved soon.