Add Timeout

Working on tests, but is this a more reasonable approach?