NOT COMPILING: starting to gut out the old threading and dispatch