I actually did this locally, I'll push when I'm done with the tests for the field