(master) new form (mostly) working