adding links. Still 2 TODOs