done a few more set up work on the handler