This seems like it should be a separate PR really