Add Macros to Basics. Close #27