Added two more shapes I had forgotten.