Trying a new approach, still debugging.