Added beginnings of macro expander