Conservative treatment for FAI... and some training....

I need to read through it again but this appears to be a good article on conservative treatment options for FAI - which is the route that I chose for my hip issues...
http://bjsmbeta.bmj.com/content/50/19/1217.full

Training today
Prep - foam roller, GFM
24 kg Get-up + x 1+1
Double 24 kg Strength Aerobics x 20 min
40 sets total {clean+press+squat}
24 kg Windmill x 5+5
stretch and Fast and Loose drills