Refactoring out some temps
better reccall (actually follows new function name)
adding test + fix for swapping functions in RecCall