Just completed. Mighty fiddly to work on. Only tricky part is re-positioning the battery connector so that all the items are flat and aligned for the screw to secure it. Used the plastic opener to help lift the battery out. You can hear the glue slowly giving up.
30 mins from start to finish. Now charging up. Thanks.