MDO team has created cookie cutter templates, these should be merged and baselined with Valkyrie