Add duplicate rider logic [Fixes #26]