updated todos, almost done yay