Can now remove fields; just need to get add button in place