shizztleleleleladöfjaldj
merged from master
ajodfasdf9adfgva
baad
working
ok more testing
added stuff
Doc stuff