Sorting out some more data
Testing server side stuff