Complete stub setup
Merge pull request #389 from rjc123/newsites

Complete stub setup