Finishing refactor to use BARS object