Started adding editable fields