Now with docstrings and better exporting