Add better timeout messages and use a thread mimicing class