Feature/crazy stuff

new pull request