Any reason we're changing these from instance to class level methods?