107 - done a few more, but marked quite a few with TODOs