Moved flickr logic into its own class
Merge branch 'feature/dan/block-cleanup' into develop