That is my plan as well as soon as I can arrange a longer stay to have enough time to do it right.