Feature/bc

Assumes you merge #20 first