Simple shapes complete