Only my C++ desire not to expose public members :P - Fixed!