Are there other things we should be doing this for or just these two?