Big update of helper class. Much cleaner.