Pull request for default website

still a work in progress, but sending pull request just to get things going.