Right, sorted that out. Need to do some renaming of the various systemd bits, but otherwise should now be able to make progress.