wip batching and UI overhaul