Revert to original find in Crosses
Add special moves, add tests