Updated todo's