With autocomplete functionality

Last thing on the agenda (other than cleaning up code) is this whole
adding and subtracting fields