Continue work on handleRowClick