Added ms-based timer; Oneshot still needs work