Update, saving state fully, first tests