Extract

@Spuds this is to replace #1927