Add source.
Further work fixing aftermath of #17.