Added TODO list and de-commented more things