Got things workin again, but with lots of shared state still.