created branch and todos - #4