WIP - macro overhaul, block specific, new syntax, env vars