Working on batch state stuff