Dealt with TODO's