Do most of #44