Work on #167 - configurable timeout amounts.