Added in all of Tripps code