June 2017 Case

A 54 yo male with flank pain and hematuria presents and the following ultrasound is obtained. What is the diagnosis?  

What is the management if the patient has been symptomatic for 2 weeks and the pain is not controlled as an outpatient and he had a 5mm stone seen on CT at an outside hospital 12 days ago?

What are the next steps?