BPA nearing completion, commiting to merge with master