Starting on final draft structure - C++11, PIMPL, etc