Started implementing debug mode