Add query ordering. Make sure we throw if someone tries to do a join. Properly convert values during an update