WIP: overhaul of adjudications