Part 2 done, passing tests except for adjacency and targets added