Macros

I forgot to send this last weekend, but here's a quick pass at cleaning up tables to use the appropriate macros. There's still more to do, but I wanted to get it up there so others can see what I'm doing.