added everything from petsbranch
still errors