Also add an UT, when you refactor this guy to include all its functionality.