Started work adding in ability to discard fields