Removed daemon thread
Added TODO