almost finish need to correct rendering and test all functionnality