Switch to observers. Make code more terse.