Finish keyword builder coding

Should work... Needs tests...

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