Please let this be last commit to get batch stuff working