Work towards #4 and #5.