Rewrote Rectangle, new Square class, new code