Oops
TODO-- yes it could be faster.