Close to having the whole demo working!