Just a little update on TODO things