Numerous changes. Removed old test form.