Ripped out poor integration for BC pumps. Closes #24