Removed most of old form, beginning to build new one