Umass branch

Added polygon functionality.