Add comment
Add proper context handling
More interface tweaking, tests
Fix endpoint implementation