@calebd's deleted CMDBlocksKit code