parser enriched

the first draft for macro expansion now exists