Added headers and began to implement prettify