Added Comments for Code Review

-Have not added support for templating
-Before suggestions from Code Review