Rewrote Link Api and added OO format. Split tests.