Beginning to add real JSDocs
Added more docs
Merge