WIP: Removed cruft. Starting again!