... and more c++11 goodness