More hooking the pages together and porting content
Merge branch 'master' of https://github.com/cms2882/cappp