Removed a TON of stuff, rewriting into v6.