Thanks Ian.  We had previously agreed to stick to the [Google C++ Style Guide](https://google.github.io/styleguide/cppguide.html) as much as possible and it's our long-term goal to have all the layers looking clean and consistent, so that's what we'd prefer to shoot for.  