moved uuid/mac address lookup to own units