#8 - More work on the bug, and moving code to a service. Fixed issue where non-duplicately named links were throwing exceptions.