Most of Brian's Changes Done