TODO gets whacked a bit