Bah. Missed some places to call back instead of returning a value.