Move TODO to the top where it belongs