Refactoring: work in progess

Stream lining the form handling
Test CRUD almost complete.

manual tests work