Work in progress, adding editable user fields