Close to functioning - still "join" issue