!Feature/1234 newawesoemfeaturemulticommit

Awesome changes