Refactor actors, plumbing still leaking a bit