Refactor out handler
Forgot to add files