Add TODO's
Remove unneeded comment
Use capture options to hold the optional request object
Code cleanup
Make HISTORY.md up to date
Code cleanup