UUIDs and sinks

Well this is kind of a mess but it's fixable I think.