@fitzgibbon: I think we should