Cleanup
Initial version of elli handler
Rename common macro
Add callback handler and example