Working on the macro expansion stuff