start reworking of actions and stuff