Merge two queries into one and fix the userInfo array

I'm still working on the interface stuff. I've implimented a modularity system. It's super basic but it works...
I think I'm close to being able to commit some stuff to index.php