[NEW] First stab at this.