Some work on the onion part done.