Finishes refactoring adding in Actors.