first steps of converting master-branch to ecs