Updates

Still very messy, but can make a successful query and return
data types.