Update to what I have working g now