SonnyJim More work on macros/general cleanup
Latest commit 765af0f Mar 8, 2016