Call and shelve

This has never been merged.