I love a girl who gave me the ultimatium, "choose weed or me". I went to college, got addicted to more drugs.?

then I went to rehab and quit all of that for me. Me and my ex has stayed in touch this whole time. We're great friends but I want more... What should I do for an aproach to her/my situation. I have given her space to have her get over the ex boyfriend she had after me... I dont want to give her too much space. She probably would hangout with me one on one. Should I ask her to hangout at my place or go out for a night on the town with our mutual friends or should I wait for her to tell me when she's ready to hangout again. I have become happier than ever being single. I dont want to give her up if I don't have to. How do I not be too clingy but foreward and fun about this? Please help me!