Doing some more stuff preping fo rthe real ability to update