Changes for 12. Traverse and maybe add need some work.