Feature/api v2

I've noticed the `id` values from the API seem to be optional for most things; not sure about districts.  Might want to make the `id`s `Optional`.