Yes, I am not surprised about Tank. Both our male dogs were mumu's boys! Now, the 9-year old Annie is a Mumu's girl! One thing good, Annie can't jump up into a chair or onto the bed anymore. She has stubby legs. Comfy pillow, I might add!
The wiring looks good! You are moving right along.