Issue 39

*Not ready for review yet*

I re-exported the Feature after adding the new field and it looks like it made some changes I did not expect. That's why there's a separate commit for each file.