removed keypress wait
whoops
merged testing