updated TODO with 5paceManSpiff's version