first commit, two problems left