Some update stuff, all commented out still