moving form queries to fetches
Fixing links
Merge pull request #35 from jhollingworth/fetch

Move to fetches