Merge Eevables + dualspirals branchs