[CB-3822] first pass at blackberry revamp