Shortcuts

Implement shortcuts mentioned in #55 
Is there a reason to unwrap the data here, rather than just pass it in to `findNextId` and have it unpack the values it needs?