Massive Overhaul

Just about every file has seen updates.