CBD with small amounts of THC: https://legiscan.com/CA/text/AB416/2017 March 7 coming up pretty quick here https://legiscan.com/CA/text/AB420/2017