Unique User method, not finished yet though.
Merge remote-tracking branch 'nlay/master'
made skeletal unit tests for Tom to implement