Add clustering, watching and primitive bundling

Signed-off-by: David Fisher-Moreau <deiform87@gmail.com>