refactored linking, added feature branch for testing