Only squares and triangles remaining. I won't commit for a while, just so i know