Add DEBUG macro
Finally Task C working