Sounds like its coming together for you. How handy is a VAGCOM! Mine has had a workout of late. Can't wait to see some update photos.