I've already refactored the thing.   Will push right away.