commit before checkout to switch back to master
updates to O2only and added a dummy avail_SOC = SOC, looks fine so far