Added TODO with further tasks