Initial commit for story 6 (ioannis,nick)