working
Bunch of fixes in case recording tests
working
had to undo the json stuff