Got rid of a lot of config/#defines in favor of a 3rd level of classes.  Still playing around with this approach but it seems promising from a development perspective. Not sure if it will be as footprint friendly, but we'll worry about that when we get there.