First draft of the cli3raids branch.

Signed-off-by: Maël Cournoyer-Michel <emerald000@hotmail.com>