More work on request handler