Finalizing NBT Changes

Hopefully putting a bow on the NBT changes. Everything should be using
them now. Needs heavy relentless testing.