Moved fields to the bottom of the class. Tests still pass