Lots of updates... bad at keeping track at this