I thought I would post this for anyone suffering from broken lock problems - https://www.emtbforums.com/community/threads/shimano-battery-in-frame-504w-stuck-and-won%E2%80%99t-release.19048/