push initial dmat refactor, moving computers