Started implementing new log macros