work on more regular action handling