BSCaller added to interface.  Nearly clean.
I think this merges...?