* Initial work in place * Added new attributes + client UUID storage * Wrapped up * Collaborator-requested changes