Yes, Andy's definitely getting the treatment, just as Heath did (who also dealt drugs when he first came to the bay). I don't mind with John as he's such a good actor and can pull it off plausibly, but I object to the writers erasing his son from existence!