Changed TODO with new direction