updating kinda working, still lots to do