moved 'TODO' tasks to issue tracker