Break out Square class to own file