More of Travis's Changes (IGNORE FOR NOW)

I am opening this so that I can more easily track my changes. Please disregard.