change diamond to diamonds
change code to make use of abstract classes