Massive changes, mostly everything complete