work in progress, adding fields/permissions