huge commit because I'm going going back back to cali cali