Scrobbling code more readable.
Implemented Matcher, but remains untested
Implemented TimeAverage class, untested as well