Works on #5, and in testing right now.