Updated todo
Added current