re-organised solution to use new package useraccounts.  Also took to my own namespace.