changes in model and controller, table links working - try 2