Moved some things up in Datatype

Now it's all committed with a 100%??? Weeeeeird.