WIP. Cleaning up external APIs / haddocks