Working towards implementing call and return
Ironed out some errors with `call`