Moving some stuff around
Moving some stuff around
Another big refactor. Rather than doing everything with maps, we'll let the user supply their own data type to try to marshal the API response into.