removing commented out bits
diamond sorta working