Almost done with output format, except for few ordering issues. While will be handled next
New headers included