zomg all the changes
more massive amounts of changes
swapping back over to .html for ease of dev for d
Merge branch 'pr/1'