First pass at new batch files