Remove one of the type parameters on Query.
Get some bugs out and add UUID type.