WIP add some fields