Refactor 2022 #21

Diamond shapes