Added very basic & buggy inline docs
Added basic inline documentation
Merged in inline-doc changes