from the way this is used, i wonder if we just want to turn it into two methods? not sure the class adds much