Hmm, maybe this should be a separate PR?