Done with BB. Need to work on better dep management