riff

Work done while at Results Imagery on behalf of Riff.