some progress maybe in editing?
Merge branch 'ajax-attempt'