trying to sort out refactor mess