Merging in work so far.

This contains a lot of work we've done so far on the site.