Put back in hacky code so that I can test out of BB.