Refactored for sanity, added retina test.