Setup overhaul, I have succumbed to the dark side. More pics (and puppy) in comments.