Baseline from #59 branch

all files from last week are added to develop