Webhook handler more fleshed out, no tests yet