First pass at multiple rows
Second pass at adding / removing rows