token input locations, can choose old location or make new one, and stuff
more javascript, making form make more sense
Just pulled derek's stuff after a while, hopefully it works