Added TODO's, split main sections to separate files