[WIP] QS 2.x

Signed-off-by: Carlo Savignano <stevewatersy@gmail.com>