Work on editing, forms & tests