Move answering into separate handlers