General chaos, rewriting a lot of things to hide dependencies.