A bit of work done on the onion part.