Entire re-write...