Tortoise breeds

Revamped all the commits and fixed merges and whatnot.  Ready for pull!