Macro expansion working, onwards to field parsing