finished refactor by re-enabling macro definitions of maps... -sai