Progress on new / edit modals