Went through first round of todo's