CHANGES - ashley this needs a sanity check please.

More descriptive comments, better redel support (I hope), include user ids with everything...

Change-Id: I7705dae5418f35b5459a4d5b2285becab0981b8f