rthe starting of the D day refactor