Final Commit

Changes and commit.