Hmmm. I kinda like the idea of keeping the data format exactly the same as the makeapi response to make life a little easier, but I guess we could just choose to not do that...