We could do this in 1.0 (I think) would be nice to do it here also.