First commit for Dyna rework