Here's an update. Still need a little help from Andrew on this.