Still a lot to do: - Delete old deliverer folder - Revisit handler funcs - Constructors - Side effects for the wrapped callback functions - Any other TODOs
