Re-thinking this.