- move stuff around
 - move handlers into it's own module