Finished up Tinkers' blocks & Extrautils CTM