New Edit, and a better version of tester code