feature: More work on post-fetch routine