Update TODO
Move request handling to request object; update and combine todo items to TODO.md; improve test api.