Started adding a debug mode