Todone some TODO's
Todone some TODO's