Week 1 dev

merging the code