Thanks for the input @ronaldbradford !

@skingry we should probably add the fields @ronaldbradford is talking about separately.

What do you think ?