Resolving conflicts with master.
Bringing bb back into the mix. Adding a brief training set to test f, bf confusion in the existing predictions.