Part of #6.