Added TODO's, split sections to separate files