WIP: overhaul adjudications