Untangled the merges

This should have the new api format everywhere and basic committee information. All my tests are passing locally.