really broken and untested commit, PLEASE don't use this - Almost finish up actual UUID support