Tortoise links

Merging before all the tests have code for so that the branch doesn't diverge too much before I get back into the office.