Some more code

Unsatisfying, though.

Signed-off-by: Francis Galiegue <fgaliegue@gmail.com>