we should probably resolve this before merging?