Final Hill commit. Diverts functionality seems to be working now, using cross/along track equations. Duplicates exist in result.