Changes to allow multiball to be more generic and centralization of the TOMCAT targets