Action handling - first working prototype, lots to improve