Fixed macros, added first attempt at Let