Change to rectangles, allow multiple users