WIP
WIP
Can add fields
And the additional data is stored
imprved test