Tester work 2

Need to get master, so this is a temp save