Implement the tidy names. Add more docs.