Working on correct linking