Add handlers I think all of this is untested unit tests never