Tidy up actions
Sort out responding