Paul, real nice work there!! If you are looking to expand your battery source you may want to consider MTO batteries from Red Lion PA. Folks have been using them for quite a few years in 0 scale 2 rail.
Many different physical configurations, excellent chargers, neat widgets, nice people to work with.