Circle mask added and partially tested, Polygon mask initial work, had to add some things to other mask too