OOPS + Moar

forgot to move my NBT stuff XD and adding shizzle