We have designed a set of modified parts for the Tomcat battery - something more solid than what you can buy in eBay
There are two halves that assemble together to create a body that houses the subC cells: just imagine one half on top of the other. There are holes for the metallic contacts. Some soldering will be required, I think