Ok, one last minor feature before release.