some todo's was done