this conflicts with #646 I would like to get that merged first if possible