First stab at adding HSL and BPA