- Progress on shape system implementation