Update gold with richard's newest stuff. Update john's too. #47

Closed rocky1138 closed 9 years ago