Editable fields nearly complete