replace pointers with light Field wrapper
Merge branch 'fields'