Added first features to clustering (WIP)

* Added option feature to both brainstorming and clustering