work-in-progress (really)

Signed-off-by: Julien Peeters <contact@julienpeeters.net>