Feature/master page

This feature isn't actually finished yet. Using this pull request to see if appveyor builds it.