Moved stuff from homeController to demoController