Now a rectangle!
Oh look, a squid
Fixed merging stuff