More Thinking C++ stuff
Stl changes