Feature/sits links - [READY TO MERGE]

Basically finished, but maybe needs some QA before merging.