Adding BAR Boilerplate & other changes