Added a bunch of changes from many of us. Almost Done!!!