Address part of #3 at least.