Feature/homepage2

I do believe this is ready for a smoketest @AaronThornton00 @robguthrie