Use a better struct that keeps track of when these guys are changed