started refactoring with actors