Edited todo's