Mostly addresses #9.