First commit, todo item #1 and #2