trying to figure out edit form
progressing...
fine tuning
fixing merge conflict
fixing gitmergency, hopefully