Feature/new stuff

büdde büdde merge me