BK-761 Convert some of the functionality to use Underscore library