inital commit, 2 problems for the 1st week already solved