started to refactor actions and stores