500px *review* (not done yet)

Don't merge this yet. Submitted pull request for review.