Added missing librairies and continued implemenation