Added Trey's stuff, altered some, pre-tested