Started implementing demo and live mode