Work in progress

Small changes to getFieldValue