Intermediate changes... trying to get macros working.