Add proper headers and more commentary