added a bunch of addform stuff