NB Experimental: major refactor (currently breaking, for potential Timbre v4)