Beginning to start implementing UUID support, this is a broken commit, this code will not work.