Finished User.xml and fixed the master-alias stuff.
Still need to ensure duplicate PIDs are not set, but this can be done with a unique index… ?