added stuff
this a mine branch commit
hope this works
did not merge