Part 2... of 3

Long story. Now there’s a part 3. Fixes Chisel