Yet more changes

Close to testing, now, hopefully.