This will need to get updated for #2 , as I'm sure you realize.