Added more arguments for better testing control
Tinkering with timeout decorator. Probably not going to use this in the long run as it's computed at execution and can't be changed dynamically.
Start of bootstrap code