moved a couple of methods into lower parts of the file for better organization (basically so the meaty method shows up first and isn't buried)