First pass of splitting every callback handler into their own classess