Moved Some Stuff Added A Few Comments