[@WanderingDragon]
That could work.  I'll have to see the reworked CS before I can approve though.  
Though I'm a bit confused, because I thought the user and the librarian were two different people.