Added header and footer files and adjusted TODO