Changed getId() to uuid.New()
Merge branch 'scott/UUID'