Getting closer to some update handler magic