Basic wiring of timeout and request time done and existing unit tests passing. Still need to write unit tests to validate this functionality, and also to check integration tests.