Code movement, structure, Chooser update.