Now actually utilize "user" objects properly. Started initial code cleanup
and fixing the rdoc.