2nd commit - 90% of the html code base