Move passes to natural bids

Also cleaned up some imports.