First Big Commit
Various Edits