Implemented diamonds [WIP]