Issues #5, #6, #7.