Rearrange priorities issue20 now dependent on issue23.