Completes #4 , Regression now Evented, with Tests