add conditionals to only make inputs to form if value is not nil