Work in progress - Adding functionnality