Fixed the row returning as dict. It's now much simpler.