A
With the module capability, i'm 100% sure it is NOT removeable. Hopefully the bottom removal for battery swapping is easy
Phil said in one of the videos that you need to give it a little wiggle to remove the battery from the module. It might seem forceful, but will remove without problems.
Just wish they didn't change screen size.