Updates on TODO to reflect progress