Are they legalizing marijuana in California?

so far i believe california and new york are the only two states that have it in legislative. hopefully though we wont have to wait for other states and obama will legalize it for the whole country