MOved DataMunger into Helper classes