Getting flick to do its work.

Please review and merge.