Move TODO to the top