I agree with this; we should consolidate these into one function.