inluced uuid removed some commented out code.
Merge branch 'test' into dev