Work in progress

Signed-off-by: Benjamin de Vaublanc <benjamin.devaublanc@gmail.com>