I was able to fit all the components within original frame except for batteries. 18 of the 32 cells are in an enclosure at the back.

(click to close)