Hey there, it does sound like gallstones...............
Your doctor may recommend an abdominal ultrasound or a computerized tomography (CT) scan to create pictures of your gallbladder. These images can be analyzed to look for signs of gallstones.
A test that uses a special dye to highlight your bile ducts on images may help your doctor determine whether a gallstone is causing a blockage. Tests may include a hepatobiliary iminodiacetic acid (HIDA) scan, magnetic resonance imaging (MRI) or endoscopic retrograde cholangiopancreatography (ERCP). Gallstones discovered using ERCP can be removed during the procedure.
Good luck and I hope you know soon what the dx is.