added links, working on transitions