Implementing user timeouts, closes #12