added adapter init todo
little fix
Merge branch 'part1' into part2