BBL-25

Project complete for now