Changing around the permalinks and added test cases to see if the linking actuall works.