Updated stuff
Updated Class headings