Cleared out all the cruft, so I can get started on this