More testing + added the links.