Finishing up work on UUID task