Add choices to custom data fields

Waiting on QA
@twymer
Plus the other instantiation of this class (adding a blank row) doesn't require initialization.