Worked on #835. Added docco documentation.

Added docco comments and moved comments around to be more like can stache.