Initial work on #327

This works, but using the plexus container would be better.

Signed-off-by: Clement Escoffier <clement.escoffier@gmail.com>