Fix domains, major redo