theohax

Change looks good, but I also agree that a `votes` subobject might probably be the best way though especially for future data added to the response.

@ reviewers: I rebased this one as well and solved its conflicts and freshened it up a little bit. There's definitely work to be done to fully replace the logic...