Issue #36 Implemented timeouts everywhere in our redundant code...