Full Commit (Same as previous, included all the files this time.)