Prep for Deferred and Gist integration. :horse: