Jesse/collab edit

Please use the utility for adding timeouts.