Feature/cool feature

Cool feature is ready