Added even more tasks to TODO List