first part finished, though polygon addition probably necessary