AUI-1594

Hey Rob, I think this works pretty well.  Let me know if you have any questions