A lot of changes, moved away from the AJAX style form for simplification.