Refactored the diamond achievement code. Tut tut cricket.