Sort out one more allocation/deallocation issue.
Timeout basically working.