main actors refactoring - WIP