Added Diamonds and Squares and easier setup routines