Peter - got generic field modification working
Peter - some cleanup and getting adding fields working. Need to move this into a modal window in the near future
Peter - Fixed tests to be running properly