Fixed C++11AndTypes, which wouldn't compile
Changed to DrawableShapes and implemented most of the comments