Added some comments
Added header
Merge branch 'draft1'