Almost finished with heading, more additions, code cleanup