Good for you. Sounds like things are going well.

I think I would use clicker training and slowly shape the behavior. I am on my way out, but when I get back I can explain it better if you like.