Initial commit for scenario 4 dev