Began work on action handling