Axel Baudot

I have made some progress with this one. The set of changes is growing so I think it would be nice to discuss it with the team to get earlier...