Added stuff to scarybranch