Got rid of old boat, made new and improved boat our default. Added new boat to test suite, and fixed issue with the vertical and horizontal shapes stacking.