finished user story 3
added datafs