First vesion after the 2-day development

Signed-off-by: Sann-Remy Chea <sr.chea@owlient.eu>