Merged from Sam's changes to Square.java