Merge tag 'v2.0' into develop

Rebuilt using python to make api requests and cache in local db
updating comments
set up query correctly
Merge branch 'release/v2.1'