_Rethink broken due to Fibers error -- about to make potentially breaking changes