Feature/new stuff

branch it baby