WIP: getting closer in terms of updating fieldswq