Major restructure. Tests may fail for a while...