Linking works correctly now.
Create form updated to work with new linking scheme