Finish up batch logic, but remove with logic for now