Started work on macros