Becoming apparent that contract $ won't solve this.