Should we figure this out before merging?