Cleaned up the bad use of threads...switched to handler